Merge: Integer and buffer overflow fixes.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Jun 2011 07:51:45 +0000 (00:51 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Jun 2011 07:51:45 +0000 (00:51 -0700)

Trivial merge